Fix check for modifier keys. (#438261, Theppitak Karoonboonyanan)

2007-05-14  Behdad Esfahbod  <behdad@gnome.org>

        * modules/input/gtkimcontextthai.c
        (gtk_im_context_thai_filter_keypress):
        Fix check for modifier keys. (#438261, Theppitak Karoonboonyanan)

svn path=/trunk/; revision=17842

diff --git a/ChangeLog b/ChangeLog
index 901f7b54aa480bfd9735529bd4bead772b14b4a7..bfe45b224f610dfa4914bcda0d6f45f0fb9b971d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-14  Behdad Esfahbod  <behdad@gnome.org>
+
+       * modules/input/gtkimcontextthai.c
+       (gtk_im_context_thai_filter_keypress):
+       Fix check for modifier keys. (#438261, Theppitak Karoonboonyanan)
+
 2007-05-14  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkscrolledwindow.c: Document scrollbars-within-bevel

diff --git a/modules/input/gtkimcontextthai.c b/modules/input/gtkimcontextthai.c
index b1a0c5dc456161d2c9549eb70f1fe06a9a51bac0..3cc67c8457966fe43fd4e801f8435ab4bb5cc1a9 100644 (file)
--- a/modules/input/gtkimcontextthai.c
+++ b/modules/input/gtkimcontextthai.c
@@ -288,7 +288,8 @@ gtk_im_context_thai_filter_keypress (GtkIMContext *context,
   if (event->type != GDK_KEY_PRESS)
     return FALSE;
 
-  if (event->state & (GDK_MODIFIER_MASK & ~GDK_SHIFT_MASK) ||
+  if (event->state & (GDK_MODIFIER_MASK
+                      & ~(GDK_SHIFT_MASK | GDK_LOCK_MASK | GDK_MOD2_MASK)) ||
       is_context_lost_key (event->keyval))
     {
 #ifndef GTK_IM_CONTEXT_THAI_NO_FALLBACK